Merged from gtk-2-4:
authorFederico Mena Quintero <federico@ximian.com>
Sat, 20 Nov 2004 00:17:30 +0000 (00:17 +0000)
committerFederico Mena Quintero <federico@src.gnome.org>
Sat, 20 Nov 2004 00:17:30 +0000 (00:17 +0000)
commit74c146301c24b2dc5146fe3fb3a60ffafb52a26a
treea4604a5acf89bf0b37492f444187f4a4e3812418
parent54b45a19b92629605abdcc6d14c1b1c3a1e941af
Merged from gtk-2-4:

2004-11-18  Federico Mena Quintero  <federico@ximian.com>

Merged from gtk-2-4:

Fixes #155744:

Try to load the whole file system model within a specified time.

* gtk/gtkfilechooserdefault.c (set_list_model): Don't create and
set the sort model here.  Instead, set up a timer in which we'll
try to load the file system model.
(load_set_model): Create and set the sort model here.
(load_setup_timer): New function to set up a timer and switch to
the LOAD_LOADING state.
(load_remove_timer): New function to unset the timer and switch to
the LOAD_FINISHED state.
(browse_files_model_finished_loading_cb): Remove the timer if
needed and set the file system and sort model; switch to the
LOAD_FINISHED state.
(gtk_file_chooser_default_finalize): Remove the load timer.
(gtk_file_chooser_default_init): Start in the LOAD_FINISHED state.
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gtk/gtkfilechooserdefault.c